From 74653f1e803fc4c75ab1a4893893414d83fb645c Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 22 Mar 2023 04:36:00 -0400
Subject: android: Refactor ic_launcher.xml to drawables

---
 src/android/app/src/main/AndroidManifest.xml                        | 4 ++--
 .../app/src/main/java/org/yuzu/yuzu_emu/utils/StartupHandler.kt     | 2 +-
 src/android/app/src/main/res/drawable/ic_launcher.xml               | 6 ++++++
 src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml      | 6 ------
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 src/android/app/src/main/res/drawable/ic_launcher.xml
 delete mode 100644 src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index 4164bd96f..79fb902ad 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -18,11 +18,11 @@
     <application
         android:name="org.yuzu.yuzu_emu.YuzuApplication"
         android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:allowBackup="false"
         android:supportsRtl="true"
         android:isGame="true"
-        android:banner="@mipmap/ic_launcher"
+        android:banner="@drawable/ic_launcher"
         android:extractNativeLibs="true"
         android:fullBackupContent="@xml/data_extraction_rules"
         android:dataExtractionRules="@xml/data_extraction_rules_api_31">
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/StartupHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/StartupHandler.kt
index 9deff6870..e2e56eb06 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/StartupHandler.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/StartupHandler.kt
@@ -35,7 +35,7 @@ object StartupHandler {
             val alert = MaterialAlertDialogBuilder(parent)
                 .setMessage(Html.fromHtml(parent.resources.getString(R.string.app_disclaimer)))
                 .setTitle(R.string.app_name)
-                .setIcon(R.mipmap.ic_launcher)
+                .setIcon(R.drawable.ic_launcher)
                 .setPositiveButton(android.R.string.ok, null)
                 .setOnDismissListener {
                     handleStartupPromptDismiss(parent)
diff --git a/src/android/app/src/main/res/drawable/ic_launcher.xml b/src/android/app/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 000000000..c060cd86c
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_yuzu" />
+    <monochrome android:drawable="@drawable/ic_yuzu" />
+</adaptive-icon>
diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index c060cd86c..000000000
--- a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_yuzu" />
-    <monochrome android:drawable="@drawable/ic_yuzu" />
-</adaptive-icon>
-- 
cgit v1.2.3